beta almost ready changes