Implementation: state consistency (improved)