removed test; added some comments