changed libraries to some that we can use commercially (oops)