i would opt to move this code to line 125