reduced update complexity by merging unit and upgrade print functions
Authored by: jacks 2003-10-24
Parent: [r7558]
Child: [r7560]