Final changes added for V1.2