Finally Fixed everything