Changes as per discussion for previous commit