Are we using this thread for changes needed for the gym battle?