Update from martin for merge