DDF-918 added some comments for clarity