Updated with snapshot