Reworked to follow the new format.