Last commit before presentation

done!