Made some changes damnit