multifid: refactor a bit more, not done