Updated to UMP 1.2