Updated version of Update 2 + headers, footers and a layout for future updates