Update 6/6/04 - tojo