Some responsiveness added