updated for new primary q