removed oldlayout