Revert "removed abused feature"

This reverts commit 0df46f96acb7fc0f801436d2f3e74c1b251ee136.
updated enlightement with new insights