Added autorefresh
merge