Update 1.2.0 (May break things)