refactored a few pss scenarios