Incorporated suggestions from Lea.