Ready for data fitting

Code updated and ready for the data fitting