Some changes to evolving data stuff