Revert "i will rework on this"

This reverts commit 3566a6e18bb0106d3590ebe001ded4723db578a1.