Moved snapshot to a separate action