Be sure to test this with old devices, these APIs changed recently.