Commit 6355a5d04a1fa8c8a05f96cf836e439717dc9e95

henry 2004-05-09T07:09:41

Renamed functions for clarity