рефакторинг
merge with dev