applied experimental changes

stfuchs is my private account. Unfortunately I noticed it to late.