removed commented handler-statements from older version and worked on notification-classes