Update 1.0

(Under work by admin, please don't edit)