upgrade robustness
new apns feedback added