Some changes in values and inputs