Large update of a few days work