numpad + partner choice added