catkinized and updated with current BRIDE version