upgrade to new package system almost complete