Will fix if refactor PR beats this one to go in :smile: