halfway through manual updates for 2.1