Changes from Milestone-3