The (proper) drop rework