Started adding live refreshing