changes for fresh android support