Refactored after the moving of the file
Authored by: hotzst 2009-08-27
Parent: [r2140]
Child: [r2142]