First stage of changes in 6th chapter

Signed-off-by: Krzysztof Opasiak <ups100@tlen.pl>