More android shenanigans (victory!)