Internal re-working
8.0.0