Make it work with Beta 3