upgrade to use new modules