updated m7 for s2w