A lot of manual updates