Updated changes for 2.1