Fixed everything back to a working state