Thesis: expanded sub-chapters regarding PDI and SWD even more