tried to consolidate ps1