Library work needs merge
Merged changes and fixed conflicts