New general layout, yet untested.