finish with comments..
ready to merge