Updated for V1.2.2