updated with new feature - Inputs