Sorta fixing these.