Added 2.1.1 changes