reworking the add/remove handler logic