added comments from master