work on handling drop