removed and add comments