major regpict and dfn rework