Changes for g9