added onScreenShown
conflict fixed