upgraded to Android API 21