Final version on class
Final version on class