made compliant with Beta7