some changes
Rearranging