Updated for 1.1.4