taras's changes