Modification to how callbacks are applied