move this up to the same line