added and removed some stuff for testing