Made Major Changes to application