added lib2
merge fix