feat(): Added back in amendments from @furzeface