q2_4: oleksandr's stuff replaced