Revert "merges"

This reverts commit 9086e753f4a3db96a54aec34404e65ea2bde4b29.
updated with Leo´s suggestions