Updated to current android verison