Changed order of services, infras