#238 Implement Yogor suggection