Added option to disable move event