Fundamental mains improvements