first working version (diag_mc fisher vectors only)