Some changes in empty