First attempt at incorporating Android changes