progressive re-org
fixed global reference