CHanges everywhere

and i mean, everywhere