major edit: removed history_from_fs, as it seemed unnecessary