changed following suggestions