Updated for 1.2