added enter support