changes from beta test