Reverts, and Fixes