- Adapted code for new android device, and new router