more changes from beta