Revert "made a few corection again"

This reverts commit c1403418bd75da343914ad0947f505721adcc5bb.
Revert "Revert "made a few corection again""

This reverts commit 28767bc70b40040f2a9469e3cd26b06eb223c62d.
Revert "Revert "Revert "made a few corection again"""

This reverts commit 3138ed206d53c353bda2e89e5a5d81becb4f46e9.
done so it calculate better
all applications are coming to the bill