Re: Reducing the number of '*lock|shot*' packages