Added key / numpad control