Added two new inputs