Some changes in the conceptual and detailed design sections
Merge branch 'change_after_second_review'