GPII-245: addressed some of @amb26's comments.