Add JM code for test