req 6.3.19.2 and 6.3.16.8 are now fullfilled