optimised newinfrastructure