Updated with click event