new package, and changed API