updated to new state manager interface