Revert "Bugs Fixed"

This reverts commit 30bca99e14c1947e9972e5d22c84de552794baa2.