Updated spider for better data massaging