rolled back some things