Committed for APNS Lesson and Bug Fixes