updating lib
merging