use-case divided into 2 parts, changed thesis structure
merged changes