CHANGES MADE BY DANIEL DON'T BLAME ME