changed lot of things