New idea for `on_drop`