#2 Some changes