Made lots of changes