Updated acc to review comments by David.