I made these changes to support battlezone (master)