adjusted for lib import support