Fixing Bugs
Revert "Fixing Bugs"

This reverts commit 3731236dc3f35b4f95d620907d42408e8a62ae4a.