merge in Julian's work