upgraded less, moved notifier