Updated with Nathen's feedback