android edits to chapter 5