rearanged it all
removed some stuff