removed some comments too