update to latest and add m7