Finished code changes for PS2