I'd like to keep this, especially as it's already implemented and even if it's not us, someone might find this useful in future