Added local check