Optimise event callbacks
Tweak to watch list