Added Christian's code.