Fixed everything with arguments