Integrate all of Cezarys comments.