@agramfort : L1842 - L1853 and L 1905 in this PR