Updated for lockout indicator