Made a lot of changes since last commit