More work on weapons