added updateOnEnter