I propose move this code to helper