updated with JMP