Final version on class