Made a lot of changes