Semantics change

Still last pull request reviewed by Denis, made two changes as feedback, no other new changes