Final 1.1 Changes