added new creepTracker, supplyTracker  and tests