Changes and Lib update