Added more interactivity