Personal fork of hub, possibly for use @trineo, mostly for my own use!