Start of layout model reworking