Updated to API 6.