updating structure for 3.0