Ok, Changing back to class!