Contributions from fwitt