(Final?) Update 1.1