minor formatting v6 support.
pending update