Improve interactivity