rolling back some things