Updated detection section