refactored some pss scenarios for staging