Added enter event + Aux function