additional changes to whoops