Changed to Class Assignment