Semantics improved