Milestone 4

Added the updates for Milestone 4.