Added auto move on click