Changes sugested by Group Buddies.