This is a part of your other PR :)