Updated to V1.2