Updated based on Brandon's feedback.