Implement Corey's feedback