Updates Milestone 6 and deep dive 2