added some and commented out some