Intermediate Save

Fixed concurrent access, stuck with overflow