rearranging things, added some notes