Changing it as you suggest...