adopted new layout