Revised Ejector to drop first, then remove source