branch works with m2-physics