refactoring
psq_score added