Fixed everything with loading