rollback and redid changes

This should work