Added Kurt's changes.