update code to keep up with OnyxAndroidSDK