As commited and with new footer