Cleaned script
New ideas on fit