Final version
Revert "Bug fixing"

This reverts commit cf4576235d73a59c18f01c0cadcf2de32799d4bf.
Revert "Final version"

This reverts commit fbd7c0d950f00fc4eaa8fc5284bd8c762a5e093f.