some optimization updated
some optimization updated