More work on drop command