Add better responsiveness