updates to accomodate m8