redoing stuff because years are bad