Deal with more tentative definitions