removed some stuff --testing