1. Rearranged some things.