Updated to PM 1.1.1