added numpad and finish