Week 2 updates to Droid/iOS