updated to controller-as and updated state