madison: trying to fix stuff