states example improvements