Fixed everything again (*untested)