Jim's latest changes for cavity filter