added source check