Moving library, incorporating old changes