added and removed some stuff