merged update of original library