Fixed everything weoohoo