add Notification msg, reorganizing