Updated to be able to release on play store