Possible implementation for #70