This changes had to be done... I guess