Better than the original @6345