Update to use on, not bind