Updated with refresh