Added enter handling by popular demand