Fixed everything better