Updated with Francois' requests.