update to 2nd pass of layout