Port to muu2d and others