continue working on android porting