some changes, added JVF and pt moments