changes for older android version support