PS1 improvements