Some changes and features