Edwins Changes for Project 3.  Haven't tested yet.