added maintenance handling