Improve on @fr1zle 's drop components