Added more inputs