Refactored the slot tracking.