few changes for typicality