Modify scenario and fix reform