Wishlist updated as a result of an input from Stephane