Minor modifications
Adding for iOS