More work on state system