we have changed this as per David's comments and i am not sure,  should I change it as you suggested ?