Added onEnter method