Updated for 1.1