added some more detection routines