Added weapon check