move this before verification