Changes from Beta feedback