some responsiveness added