Changed entities

This reverts commit 689dac796dc6d5b75af0c12bcb5a5293e1087ab8.

Revert "New behaviours"

This reverts commit
bfe34f96b59c924e456ac1d5e2ed0b392d792007.