changes from behavior included
Revert "develop behavior"

This reverts commit 35f56102d500ad51254f880e2f7565fd8957aa87.
common ancestor
changes in master
brice changes
still conflicts