Fork of android version to allow modification