@ Implementing freeze and restart method
@ Fixing merging issue and other stuff