Added axis and key detection.