Revert "All Bugs solved"

This reverts commit b3a984819976cad3193a267dfdc2c72b0e32084c.