New code submitted, please review.  Thanks!