Some changes at input