restructured code for better order of events
Authored by: mrieser 2009-05-25
Parent: [r7086]
Child: [r7088]