Working app - ios fixed, android fixed