1.1 and 2.1 Updates