Added proper 3-component fits