added to android, all code validated