Fixed pipe and added numpad