modify for Beta6