Incorporated comments from Alissa.