Changes to the forcasting

Final changes befor the demo