2nd commint with updated lib