Perfect upgrade of the original in every way!