Added keydown/up handler