comments modified and added