Changes made by Kendrick Clark (stefon@vi-dev.net).