Integrate changes from meeting with Cezary.