modified for merge