ADDED SUPPORT FOR M7