any particular reason you moved this out of the else {} ?