update based on Thad comments.