Christian's first stab - updated