I think I'll need to refactor those two methods.