updated to support click-events