responsiveness added
merge