Revert 079b47e..efc20b5

This rolls back to commit 079b47eba70b6e3f857cfafd9f8ce2592ad57cbc.
Fixed Bugs