complete LAF changes