improving ps1 handling