Make snapshot totally work