Made lots of changes to everything