merging in recent changes