added more flexibel housekeeping setup