Addressed some comments from Reynold