first changes to meet Christian's requirements