Beginning to remove octet dependence