some addjust
some edit