@edwlook this block looks a lot like the last one. Let's try to make this a bit more DRY