updated for vitalii