Updated for snapshot