Surefire z2 upgrade. My goals are to increase lumen output and increase runtime.