DAR-1727, add comments