finish of the day, changed a lot of things..arrived at the flow