Now handles new assignment docs correctly.