corrected data structure in layout --KW