fixed johns requests round 1.