Christian's changes are merged