fucked up merging new-lib