Added some more lines for mva computation