change a lot of stuff ..