PLA-1486 My changes (Gaming)