Updated for 1.2.0
Updated to 1.2.0