Changed maintenance mode design