more changes, finial fixed android version