in progress change to get all these new packages working correctly