Revert "allmost end"

This reverts commit 49b0cf8b0099b3d3d22e04a81714bc36a7ddc85c.
Revert "Revert "allmost end""

This reverts commit 88ad804d76b57d279ec3b17963067638e9dce215.
comments added