Revert "adding huristics"

This reverts commit ba02a89d5c06a90354ada0f9659d7c780e78f896.
Revert "Revert "adding huristics""

This reverts commit 9e6394c8636d10b24dfee75db869936582c2231a.
Revert "Revert "Revert "adding huristics"""

This reverts commit 298ab8c54284c778c428d3e48d0f85990b8c52c0.