State representation overhauled.