merged changes from Jamie McClelland.