slight rethink in prep for android