added maintenance feature