fixing function for House Keeping and Maintenance