changed stuff around
removed some stuff