adding support for API 8