Wimax (shooter) changes

Change-Id: Ic59f4826f53c19e6a0fc800f346745c9a93f5859