this definitely is an improvement :-)