Rearranging the code again.