If you add the comment here as discussed, I'm happy to merge this