Integrate Cezary's comments.