Android version now works!