Some changes that improve overall performance