I think this is missing the when() for the isStandard?