Modified for allowing local check