added support for all weapons