004.09 Reverted controller_state back to a singleton