more change to the way the services and packages are handled