added changes for 2.0