removed some comments left for debugging