Done, but will be part of the next PR