merging martin changes