Add comments based on two criteria