putting christopher's changes back in

stupid merge...