Cell tracking redesign