@bschussek do you agree with this change?