Automatic changes
Corrected RBC state machine