Revert "Had a look at what is already done, made minor changes"

This reverts commit cc57e0391d4b8cc628c46fd7dd09a2cd12466abd.