Updated for emergency release 1.1