Revert "latest fixes/features"

This reverts commit 51726b567351520fcf9f715ec40a0ffa6660a208.
dummy