Code changes for V.2.0