Updated for publishing on google play