use factory to replace individual fitting model
remove x and y from outputs