Updates to PS1 again