PS3 version refactoting