Slight test mods.
Still not ideal, but still works.