Incorporate universaldetector code