Completed 1.0 and Upgrade assignments