updated for the v2 libraries