i'm happy to merge as is if you're not convinced :)