fix giant mess