update based on comments from Gary
(#248)