updated to use adaptor packages rather than bundling