Added Lib and few new code