Final commit for 1.1