added some additional infector checks ..