Made some changes. Might be crazy.