Add notifications
Combine finalization and save