Bring back the master state function
Refine the master state systems