Now adapt the code in #6 to use them ...