updated with register handler
updated with push notifications