Updated to use same layout (with assign function) as MOD.