Incorporate Corey's feedback