refactroring according to changes in flexmediator