It actually works now, also unification of files