PS1 vastly enhanced and simplified a bit