Added changes to challenge #2,4, & 6