Feature/delayed notification