Update 2.0 (first finished copy)