fixed changes from ray ventura