further notifs optimizations, finalized claim and custom