added Kurt's changes