Some random changes
Lots of changes