Updated makeSnapshot