Fixed PS1 setup (still issues if PS1 already exists)