Revert "Finalizing"

This reverts commit 4be2b723b5de1fea677fa8190374b4f4fc566c7d.
Revert "Revert "Finalizing""

This reverts commit 7f0e1e098fc2a3ad0de38001b6af353a6d91dd2d.
solving conflicts