rolling back to check 3a and 3b commit