Nit: move this up to line 280-290