Updated for 1.2.0