Updated for firmware 1.1.x