Modify to cater for cross-platform android and iOS app