finalizing Fedor's task