working on lib v2 changes