add the err sift part
Merge branch 'dev'