Minor tweaks to Assemble and added notify