regular update and add comments