This is the only bit that I am unsure about. @rougier do you think this is ok?