close ticket 13: improved APNs mechanism