Changes to make it on par with iOS app