Brought in M8 sources