Not working properly with latest Android version, send updates