Simplified the UserNotifier, added friend_notification