updates for primary/non-primary use case