Updated to reflect 1.2 changes