Rearranging code. Ooops!