We should move this inside the if statement below