Final updates
Final updates milestone 2