@paulp what do you think of this change?