v09 reviewed. 1 small TODO