changed some definitions in Library