Bug fix for tracking animation & data reorganization