Fixed everything finally