new layout, start of part 2