@nulltoken what do you think about this last change?