more changes suggested by Josh.