Updated for 1.2.2.Final