Refactored after the moveing of the file
Authored by: hotzst 2009-08-27
Parent: [r2129]
Child: [r2131]