added 5-1 and 5-2 and did some cleanup.