Removing temporary changes to allow skipping through flow for testing
Updated for season 3 live operation