Updated Version

Pre-Milestone 3