These two methods could probably be unified together to simplify some of the logic.