Added snapshot and some comments