Minor Update To Class