Fixed three alike and tested
Merge branch from monsendag