Adapted to the two-handed and firearm changes.