Minor modifications to work with 2 component fits