Updated detection scheme