rebuilt with notify/toolbelt