Reversed some code and fixes.