more landing changes
more landing changes fixed conflicts