Updated mod.

EXPERIMENTAL!