Optimizations
Improve UAV detection