Started revision after comments from examinator
Commit before changing to laptop