Finish Notification arrangment problem

TODO: Linking problem