Addressing @agramfort's comments