Integrate davecheney change suggestions