Refactoring Section 4 (prepare integration of note of 2013-10-11)