added pause
merge