almost done with m7