Updated based upon Wendy's feedback