Reduce complexity (take 2)