Merge with remote from the small modification made to gamecontroller