Updated for Alpha 1.1.1