Added g6 and g7 for feature set