Final commit. All working on iOS and Android