changes for gamePad null?