Added more input variables.