Changed and removed some stuff.....