AW: Some L1 updates