ENHANCED RAY THEORY