changes according to feedback from mleibman. Thanks!