adapt to new layout