Added more states for tracking.
Changed Initialized to None.