Some changes according to feedback