This is modified for merge