fixing some responsiveness