Updated header and library