refactored the drop... filters