Lots of manual updates