Update for g9