Reworked to reflect rest-structure