Updated based on Toby's feedback.