Moved upkeep code