Changes to include jpsi MC possibility