Changes made by Peter Zentai (pzentai@msn.com).