Updated with fixes from review.