Unit Detection Improvement