final pass addressing francois' points