Updated for 1.1.12