Updated to Pomm 1.2