A Citori Trap model would be the ticket for you. Just make sure the stock comb is the same. I made the change and lost quite a few birds for some time, because the new gun had a higher comb and it beat the hell out of me. Retried my old gun and everything was fine, a lesson learnt !