new layout, more solutions