Minor fix
Improved the recount and notifications