More manual updates