Revert "change of plan"

This reverts commit e69d6e71b0e9869478872f941a5e2696ff252022.
more codes

Reverted yesterday’s commit, better approach