addressed comments from over the weekend