uncomment second point. update/add some comments