updates for live testing
live test updates
updates for tracking and clean up