Final commit before MA-Thesis-filing