removed some stuff from here