Changed to new SDK + new integration