Revised layout