Incorporated most of Christian's feedback