bylk update of m7 changes from ethan change (intervigil)