Changed lot of things