some local update in master branch for loss free update