added and removed some printing