Revised layout.