now fully proof-read by Jonas. new Files for this to avoid GIT-bugging