A storage system maintains a journal and a snapshot of one or more data volumes. Two journal entry types are maintained, an AFTER journal entry and a BEFORE journal entry. Two modes of data recovery are provided: "fast" recovery and "undo-able" recovery. A combination of both recovery modes allows the user to quickly recover a targeted data state.