optimise out extra notify