Fix simulator and android app for demonstration