adding more stuff for detection...