move this method to other class