merging in mark's changes
merging