reworked flow for better notifications