Updated format, layout