last commit before presentation. all seems to be ok!