merging in Matts changes