Implemented REQ6 and REQ7