Christian's changes