Updated for 1.2 release