Revert "Revert "changes to the code third try""

This reverts commit 4ef66ab150f85988a218060a65c35df92223c3f0.