big changes and corrections