finally de-derpped