Snapshots working + bug