Thanks to @maxcountryman for the code review