Finished, need some comments