Removed History.None and use undefined in its place to simplify logic