Improve weapon system