The same modifications as previous but without touching mcAnalysis.py